diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 12:21:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 13:30:23 +0100 |
| commit | 93947d88f2abdf17d374a2d83cdb051ef9bafb2c (patch) | |
| tree | 4e1f967ed1e56ae70d3df7eaa7de32c20f905db6 /libavformat/librtmp.c | |
| parent | d756b2b530ca742ac930ca6e9d1ba86ec8af86c9 (diff) | |
| parent | 24abd806ea0cfb0d988d2f0044eac79cff12918c (diff) | |
| download | ffmpeg-93947d88f2abdf17d374a2d83cdb051ef9bafb2c.tar.gz | |
Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'
* commit '24abd806ea0cfb0d988d2f0044eac79cff12918c':
ljpegenc: deMpegEncContextize
Conflicts:
libavcodec/ljpegenc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
tests/ref/vsynth/vsynth1-ljpeg
tests/ref/vsynth/vsynth2-ljpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/librtmp.c')
0 files changed, 0 insertions, 0 deletions