diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-04 20:07:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-04 20:08:22 +0200 |
| commit | 0efe3be71d94a094b2de6ae151309ab875a5463e (patch) | |
| tree | aab64eb23632de4b1477a47c3fd74fa4bb91db97 /libavformat/mux.c | |
| parent | d76f0c0378dfd86883df28d32fdbc9071e2606ff (diff) | |
| parent | 39ec5e1cf8444f827c42effb76e5694e091bbff3 (diff) | |
| download | ffmpeg-0efe3be71d94a094b2de6ae151309ab875a5463e.tar.gz | |
Merge commit '39ec5e1cf8444f827c42effb76e5694e091bbff3'
* commit '39ec5e1cf8444f827c42effb76e5694e091bbff3':
avconv: Report the codec and the encoder separately
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
0 files changed, 0 insertions, 0 deletions