diff options
| author | Michael Niedermayer <[email protected]> | 2014-01-09 15:46:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-01-09 15:46:31 +0100 |
| commit | cab5315519ff8172f3b07dbcc4d4829ae567b1a9 (patch) | |
| tree | 581de8554c6b51196f7b8a06805bb6a0af9e4e93 /doc/examples/muxing.c | |
| parent | c1362ca0479eedc6171306276f6ed4baa7e9882f (diff) | |
| parent | d48132b7de7601c8c2769c0e92a43baa7759b991 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mjpegdec: apply flipping after decoding, not before
Conflicts:
libavcodec/mjpegdec.c
libavcodec/mjpegdec.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions