diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 12:45:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 12:49:23 +0100 |
| commit | 6c68522a2aa8c3fc664482ab8a18c991039c78aa (patch) | |
| tree | 94cd9643941829de2e87f29fc217e3f2b4db8790 /libavcodec/srtenc.c | |
| parent | 24af050c2fa9c28c85f68ac5425fc3fbaa826343 (diff) | |
| parent | 809c3023b699c54c90511913d3b6140dd2436550 (diff) | |
| download | ffmpeg-6c68522a2aa8c3fc664482ab8a18c991039c78aa.tar.gz | |
Merge commit '809c3023b699c54c90511913d3b6140dd2436550'
* commit '809c3023b699c54c90511913d3b6140dd2436550':
mjpegdec: check for pixel format changes
Conflicts:
libavcodec/mjpegdec.c
See: 5c378d6a6df8243f06c87962b873bd563e58cd39
See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/srtenc.c')
0 files changed, 0 insertions, 0 deletions