diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:18:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:19:26 +0100 |
| commit | fb06b8ba9371495d051d2fd815a21fb1c1392b73 (patch) | |
| tree | 7e65ebf4b5e2f8b9af9cd4dbf19cb3e06bad8df0 /libavformat/rtmp.h | |
| parent | 0d9f2f5c47a008d3077510e499d68a4e960e2c66 (diff) | |
| parent | 0812f5a40a0a190172b6de6e91755b882472ddc5 (diff) | |
| download | ffmpeg-fb06b8ba9371495d051d2fd815a21fb1c1392b73.tar.gz | |
Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'
* commit '0812f5a40a0a190172b6de6e91755b882472ddc5':
mjpegenc: write the JFIF header if the sample aspect ratio is set
Conflicts:
libavcodec/mjpegenc.c
See: f3ce748d3453a490f32a5518f9cf6bef6892a30c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmp.h')
0 files changed, 0 insertions, 0 deletions