Merge remote-tracking branch 'cus/stable'

Browse Source

* 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>

pull/26/head

Michael Niedermayer 12 years ago

parent a6e46ed51a 02fc61a5a6

commit ec837a0899

1 changed files with 3 additions and 4 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save