diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-06 21:35:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-06 21:35:18 +0200 |
| commit | 2fd49019210a9fbe430b1b94ff7a2f98a6d0fed1 (patch) | |
| tree | 15a45d423407f9a2c2cafd290915e3756f4fab94 /avconv.c | |
| parent | ff5e1b0b7a975fc84137381dd15dcc5a5ff21a78 (diff) | |
| parent | 7042337673ee75300a6f668fbcf3074213b06977 (diff) | |
| download | ffmpeg-2fd49019210a9fbe430b1b94ff7a2f98a6d0fed1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: add 'cplxblur' private option
libx264: add 'deblock' private option
libx264: add 'b-bias' private option
libx264: fix setting some options.
libx264: remove useless assignment
ac3dec: avoid pointless alloc and indirection for input_buffer
mpeg12: cosmetics: reformat as K&R
Conflicts:
libavcodec/libx264.c
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'avconv.c')
0 files changed, 0 insertions, 0 deletions