eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
64835 commits 37 branches 405 tags 511 MiB
Commit graph

4 commits

Author SHA1 Message Date
Michael Niedermayer
213e82b55c Merge commit 'b513bf6f69' 
* commit 'b513bf6f69':
  yuv4mpegdec: do not set coded_frame properties

Conflicts:
	libavformat/yuv4mpegdec.c

See: b45a3e167f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-18 14:02:31 +02:00
Michael Niedermayer
56d3cd1455 Merge commit 'e4dc1000d7' 
* commit 'e4dc1000d7':
  yuv4mpeg: split the demuxer and muxer into separate files

Conflicts:
	libavformat/yuv4mpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-18 13:37:25 +02:00
Anton Khirnov
b513bf6f69 yuv4mpegdec: do not set coded_frame properties 
coded_frame is not meant to be changed from outside of lavc, and is not
used for decoding.
Set AVCodecContext.field_order instead.
 2014-05-18 10:22:08 +02:00
Anton Khirnov
e4dc1000d7 yuv4mpeg: split the demuxer and muxer into separate files 2014-05-18 10:21:31 +02:00
Renamed from libavformat/yuv4mpeg.c (Browse further)