diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-16 20:00:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-16 20:00:26 +0200 |
| commit | 3574d34aca9dfac28d61bd783a7aa9b4c2d736f0 (patch) | |
| tree | 673f10ac7180228bf19f7e173918e184b33add45 /libswresample/version.h | |
| parent | 6928ea7eb0fbb12fa1d90075495fc910fbe16971 (diff) | |
| parent | 51748b6377ff4032dea4d5d73d42ad9199c2366f (diff) | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
mpegts: always parse pcr
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/version.h')
0 files changed, 0 insertions, 0 deletions