aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/a64enc.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-22 17:17:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-22 17:17:10 +0200
commitafe09e490a30c97aad6736f99d186634c354eb34 (patch)
tree13aaa7d073615793f9471c570b44b0cd80d74998 /libavcodec/a64enc.h
parentf8c4dbe45ee2d76340e5b1071d998f6fb15e1aca (diff)
parent5025dbc577c9a9e0109cb363ac630a9eeda6dc1d (diff)
downloadffmpeg-afe09e490a30c97aad6736f99d186634c354eb34.tar.gz
Merge commit '5025dbc577c9a9e0109cb363ac630a9eeda6dc1d' into release/0.8
* commit '5025dbc577c9a9e0109cb363ac630a9eeda6dc1d': wmaprodec: return an error, not 0, when the input is too small. vorbisdec: Error on bark_map_size equal to 0. Update RELEASE file for 0.7.8 update year to 2013 oggdec: make sure the private parse data is cleaned up indeo5: update AVCodecContext width/height on size change doc: filters: Correct BNF FILTER description Conflicts: RELEASE Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/a64enc.h')
0 files changed, 0 insertions, 0 deletions