git.osdn.net Git - android-x86/external-ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Fri, 1 Nov 2013 10:33:36 +0000 (11:33 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Fri, 1 Nov 2013 11:59:08 +0000 (12:59 +0100)
commit	78265fcfeee153e5e26ad4dbc7831a84ade447d6
tree	92bc81fca00966f3c867baa7dd339eb5c62730c4	tree \| snapshot
parent	2acc525d786f0ee4b0a354858a5f146ce6580658	commit \| diff
parent	28096e0a806e57376541e6222d315619906e3c55	commit \| diff

Merge commit '28096e0a806e57376541e6222d315619906e3c55'

* commit '28096e0a806e57376541e6222d315619906e3c55':
h264: wait for initial complete frame before outputing frames

Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/mpegvideo.h
libavutil/frame.h
libavutil/version.h

See: a64b028aeb6579636e578ceb73f69b468bddb2f0 (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

external/ffmpeg

About OSDN

Find Software

Develop Software

Help