aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/wtvenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-10 04:35:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-10 04:35:35 +0200
commitbd553941ae518cfcff24efae829ee9af55dcfb15 (patch)
tree22ba3296840219f46a3dfee1b72013ac10e57a4b /libavformat/wtvenc.c
parent31c21d2f690533ed9e8652b130d5ce4cad1fb13f (diff)
parenta014b9614e6165fb8df9e756f46a95d516794678 (diff)
downloadffmpeg-bd553941ae518cfcff24efae829ee9af55dcfb15.tar.gz
Merge commit 'a014b9614e6165fb8df9e756f46a95d516794678' into release/2.2
* commit 'a014b9614e6165fb8df9e756f46a95d516794678': Prepare for 10.1 Release Conflicts: RELEASE Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtvenc.c')
0 files changed, 0 insertions, 0 deletions