Merge commit '28096e0a806e57376541e6222d315619906e3c55'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 10:33:36 +0000 (11:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 11:59:08 +0000 (12:59 +0100)
commit78265fcfeee153e5e26ad4dbc7831a84ade447d6
tree92bc81fca00966f3c867baa7dd339eb5c62730c4
parent2acc525d786f0ee4b0a354858a5f146ce6580658
parent28096e0a806e57376541e6222d315619906e3c55
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>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_refs.c
libavcodec/mpegvideo.h
libavcodec/options_table.h
libavutil/frame.h
libavutil/version.h