Compare commits

...

2 Commits

Author SHA1 Message Date
Michael Niedermayer
f139838d64 Update for 0.10.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-17 09:14:13 +01:00
Kelly Anderson
0a224ab102 libx264: fix duplicate stats entry
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-17 08:56:59 +01:00
4 changed files with 3 additions and 4 deletions

View File

@@ -31,7 +31,7 @@ PROJECT_NAME = FFmpeg
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 0.10.1 PROJECT_NUMBER = 0.10.2
# With the PROJECT_LOGO tag one can specify an logo or icon that is included # With the PROJECT_LOGO tag one can specify an logo or icon that is included
# in the documentation. The maximum height of the logo should not exceed 55 # in the documentation. The maximum height of the logo should not exceed 55

View File

@@ -1 +1 @@
0.10.1 0.10.2

View File

@@ -1 +1 @@
0.10.1 0.10.2

View File

@@ -70,7 +70,6 @@ typedef struct X264Context {
char *partitions; char *partitions;
int direct_pred; int direct_pred;
int slice_max_size; int slice_max_size;
char *stats;
} X264Context; } X264Context;
static void X264_log(void *p, int level, const char *fmt, va_list args) static void X264_log(void *p, int level, const char *fmt, va_list args)