aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/assenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-03 20:20:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-03 20:21:01 +0200
commite4bf3a97de9c39bbf0a37074e8cba756f3c1a87b (patch)
treeaa57acf7033459e0ac918f08a7d07dea234919af /libavformat/assenc.c
parentc8faa47484466e70fd8be83c2ba7850cd818aa11 (diff)
parent4a023d5b53132ced3643d0e8397baa80cf75f656 (diff)
downloadffmpeg-e4bf3a97de9c39bbf0a37074e8cba756f3c1a87b.tar.gz
Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec
* 'master' of https://github.com/upsuper/ffmpeg-vdadec: vda_h264_dec: remove check_format Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/assenc.c')
0 files changed, 0 insertions, 0 deletions