aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/rematrix.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-15 21:29:07 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-15 21:29:12 +0200
commit1680f9c588504d691688987f0299603be1c52b64 (patch)
tree098437dd3e57bee076289dfd94bc4077b20fcbc7 /libswresample/rematrix.c
parent4e160ecdbc0561068f2e690f8e9ec714e28497d0 (diff)
parent4512ee78e19fdb011bdec1b3a8dc0b315c82a81e (diff)
downloadffmpeg-1680f9c588504d691688987f0299603be1c52b64.tar.gz
Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e'
* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e': mpegts: Mark the muxer as supporting variable fps Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libswresample/rematrix.c')
0 files changed, 0 insertions, 0 deletions