diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:59:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 12:59:41 +0100 |
| commit | bf00132a14b9c0c017404f2a36b9e9213b29e2cd (patch) | |
| tree | d06a369dbd45b5e8a1035d2da84a7d215132bb85 /doc/examples | |
| parent | ede5946b709513b84e12c6afd6f963e9304214f5 (diff) | |
| parent | da4f5d9d77882bee568266d764b95b51f81b7871 (diff) | |
| download | ffmpeg-bf00132a14b9c0c017404f2a36b9e9213b29e2cd.tar.gz | |
Merge commit 'da4f5d9d77882bee568266d764b95b51f81b7871' into release/2.2
* commit 'da4f5d9d77882bee568266d764b95b51f81b7871':
mjpegdec: check for pixel format changes
Conflicts:
libavcodec/mjpegdec.c
See: 5c378d6a6df8243f06c87962b873bd563e58cd39
See: a2f680c7bc7642c687aeb4e14d00ac74833c7a09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples')
0 files changed, 0 insertions, 0 deletions