ffmpeg/libavcodec/mpegvideo.h at 42874666a6cb53fac4eec99eff27f8975b799f92

mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 14:15:29 +01:00

Files

Michael Niedermayer 93947d88f2 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>

2013-12-06 13:30:23 +01:00

41 KiB

Raw Blame History

View Raw

41 KiB Raw Blame History

41 KiB

Raw Blame History