aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/base64.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-15 01:20:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-15 01:20:44 +0200
commitc9ea1f7fc5e92bacf0418ec3be78237827cb9fd1 (patch)
tree848a66d1d980550ed8c418ca7b98b7ef5b2c8c07 /libavutil/base64.c
parent47de8ccf426629a93f383ebcad2b7914b51a1f44 (diff)
parentba4cb43f0b94ad7a468d34c172a87c73c95243a7 (diff)
downloadffmpeg-c9ea1f7fc5e92bacf0418ec3be78237827cb9fd1.tar.gz
Merge remote-tracking branch 'jamrial/release/1.2' into release/1.2
* jamrial/release/1.2: oggparseskeleton: avoid header parsing failure oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call oggparseskeleton: Fix fisbone header parsing Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/base64.c')
0 files changed, 0 insertions, 0 deletions