aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mdct_fixed_32.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-01 11:33:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-01 12:59:08 +0100
commit78265fcfeee153e5e26ad4dbc7831a84ade447d6 (patch)
tree92bc81fca00966f3c867baa7dd339eb5c62730c4 /libavcodec/mdct_fixed_32.c
parent2acc525d786f0ee4b0a354858a5f146ce6580658 (diff)
parent28096e0a806e57376541e6222d315619906e3c55 (diff)
downloadffmpeg-78265fcfeee153e5e26ad4dbc7831a84ade447d6.tar.gz
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>
Diffstat (limited to 'libavcodec/mdct_fixed_32.c')
0 files changed, 0 insertions, 0 deletions