aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-16 20:00:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-16 20:00:26 +0200
commit3574d34aca9dfac28d61bd783a7aa9b4c2d736f0 (patch)
tree673f10ac7180228bf19f7e173918e184b33add45 /libswresample/Makefile
parent6928ea7eb0fbb12fa1d90075495fc910fbe16971 (diff)
parent51748b6377ff4032dea4d5d73d42ad9199c2366f (diff)
downloadffmpeg-3574d34aca9dfac28d61bd783a7aa9b4c2d736f0.tar.gz
Merge remote-tracking branch 'cus/stable'
* cus/stable: mpegts: always parse pcr Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/Makefile')
0 files changed, 0 insertions, 0 deletions