diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:05:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:05:16 +0100 |
| commit | a77a27a24b27fc29d119b00866740e4d0b69ba28 (patch) | |
| tree | f3f21b0eb79152d88dab355297992d26d9d1c2a0 /libavcodec/assdec.c | |
| parent | 6f5f0671f3d6db98551822728d413c367e52c377 (diff) | |
| parent | 2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2 (diff) | |
| download | ffmpeg-a77a27a24b27fc29d119b00866740e4d0b69ba28.tar.gz | |
Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'
* commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2':
libx264: change i_qfactor to use x264cli's default
qtrle: use AV_LOG_ERROR in an error message.
Conflicts:
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/assdec.c')
0 files changed, 0 insertions, 0 deletions