-
Michael Niedermayer authored
* commit 'eb4f9069': lavf: More informative error message Conflicts: libavformat/mux.c See: 30ced7e6Merged-by: Michael Niedermayer <michaelni@gmx.at>
fc6aa304
* commit 'eb4f9069': lavf: More informative error message Conflicts: libavformat/mux.c See: 30ced7e6Merged-by: Michael Niedermayer <michaelni@gmx.at>