aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/libswresample.v
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-02 18:15:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-02 18:20:24 +0200
commit513042c92669dbfcd604a9dcdb96176e05ecba90 (patch)
tree076d1be0435de00d262aa2c202fbb3ee3fb3268e /libswresample/libswresample.v
parentf5b31daa5e27c009bae78c0ae6a366aaa9dfc9fe (diff)
parent55f9037f38bc3beacb2f5a17408c1d24c077d7fd (diff)
downloadffmpeg-513042c92669dbfcd604a9dcdb96176e05ecba90.tar.gz
Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'
* commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd': avformat: split muxing functions from util.c Conflicts: libavformat/internal.h libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/libswresample.v')
0 files changed, 0 insertions, 0 deletions