summaryrefslogtreecommitdiff
path: root/libavcodec/libx264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-21 14:25:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-21 14:44:32 +0200
commit406cdddbdd229cead581eb1c7b978a2c59453b24 (patch)
tree0c36c4c2fcafb618ae80074a9a1c07a06872a91f /libavcodec/libx264.c
parent9543cd593ed8249e9885598fc53de163c9d4e2d3 (diff)
parente52e4fe10d96da4ed26e2acbe3c1ab69485ed75d (diff)
downloadffmpeg-406cdddbdd229cead581eb1c7b978a2c59453b24.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: libx264: add forgotten ; matroskadec: fix a sanity check. matroskadec: only return corrupt packets that actually contain data lavf: zero data/size of the packet passed to read_packet(). ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code ARM: align PIC offset pools to 4 bytes ARM: swap source operands in some add instructions configure: update tms470 detection for latest version lavf probe: prevent codec probe with no data at all seen motion_est: fix use of inline on extern functions Conflicts: libavcodec/motion_est_template.c libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx264.c')
-rw-r--r--libavcodec/libx264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index d23ced1c0d..2c4ffa205a 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -72,7 +72,7 @@ typedef struct X264Context {
int direct_pred;
int slice_max_size;
char *stats;
- int nal_hrd
+ int nal_hrd;
} X264Context;
static void X264_log(void *p, int level, const char *fmt, va_list args)