Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'

Browse Source

* commit '56c2f37727015212a404cae0f444d8bc8704d691':
  avconv: drop update_sample_fmt()

Conflicts:
	ffmpeg.c

No change as the removed code is not in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

...

This commit is contained in:

Michael Niedermayer 2015-07-19 11:57:34 +02:00

parent 3d4297f851 56c2f37727

commit 8534c8c77a

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available