diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 02:41:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-01 02:41:26 +0200 |
| commit | ec837a08993d4272eb0e8687fe90025c2b9638ac (patch) | |
| tree | 594b266e8a30a326a8c77fc033cb3df8f14dc4e1 /tests/fate/video.mak | |
| parent | a6e46ed51ab947cfd25ab8f0b99772ea11ad5bac (diff) | |
| parent | 02fc61a5a68321acb9d84bf30580cbdb3a2db1d6 (diff) | |
| download | ffmpeg-ec837a08993d4272eb0e8687fe90025c2b9638ac.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: always send zero packets to flush audio decoders
ffplay: use frame->pkt_pts instead of pkt->pts in audio pts calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/video.mak')
0 files changed, 0 insertions, 0 deletions