aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/v408dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-07 00:48:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-07 00:48:23 +0100
commitc09eeca5468ca03cc5733f08dc6303b4aef2c2c1 (patch)
tree4cb9bc74bdd24febb33f737eb4d8206f0c6f803a /libavcodec/v408dec.c
parentcb03d29dec649efb03b895810f610e61d70800ca (diff)
parent8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4 (diff)
downloadffmpeg-c09eeca5468ca03cc5733f08dc6303b4aef2c2c1.tar.gz
Merge commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4'
* commit '8a3d9ca603f4d15ecaa9ca379cbaab4ecaec8ce4': libavcodec: Add an OpenH264 encoder wrapper Conflicts: Changelog configure libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/v408dec.c')
0 files changed, 0 insertions, 0 deletions