diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:18:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:19:05 +0200 |
| commit | 3bf81d389638199ebdbe8f2d302b4c2a7f6563d2 (patch) | |
| tree | 86e0c5500a1f4a41c1304d71d47b766165bf0444 /libavcodec/g722.c | |
| parent | 53d2b69b72b0bac919f3083298d3ad914ea86735 (diff) | |
| parent | 85ca012ba680bdf942d95ab98c74f6a28f447588 (diff) | |
| download | ffmpeg-3bf81d389638199ebdbe8f2d302b4c2a7f6563d2.tar.gz | |
Merge commit '85ca012ba680bdf942d95ab98c74f6a28f447588'
* commit '85ca012ba680bdf942d95ab98c74f6a28f447588':
mjpegenc: Fix JFIF header byte ordering
Conflicts:
libavcodec/mjpegenc_common.c
See: b19313218c32fa9446d474cbddb11c0776868cd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722.c')
0 files changed, 0 insertions, 0 deletions