diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 11:57:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 11:57:34 +0200 |
| commit | 8534c8c77a509987d6b63ed3b65155c3561b8583 (patch) | |
| tree | 77c3027c756f9e4e342557bb2f590a0083307181 | |
| parent | 3d4297f851ec68475cd60f040f30ebe9c0822449 (diff) | |
| parent | 56c2f37727015212a404cae0f444d8bc8704d691 (diff) | |
Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'
* 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>
0 files changed, 0 insertions, 0 deletions