aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mtv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-19 08:27:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-19 08:27:35 +0200
commit209cb8afe0092e66411d730b85139947cc706708 (patch)
tree6f70969604b0f7a2f2fb8d1f89f2e04cd6575f74 /libavformat/mtv.c
parent9ead06057acfcc43bcb99a63a7c58543007b2847 (diff)
parentc9c7bc4493bc72254cfb826941cdaf56c9b110d6 (diff)
downloadffmpeg-209cb8afe0092e66411d730b85139947cc706708.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavfi: switch ff_default_get_audio_buffer() to av_frame_get_buffer() Conflicts: libavfilter/audio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mtv.c')
0 files changed, 0 insertions, 0 deletions