aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-05-19 22:09:34 +0200
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-05-22 20:01:31 +0200
commit5ecdfd008bce961c3241eaa1f8dc06e82a6b12db (patch)
tree65def2a600cdbb8f1dfa3b40cec010e33738bee7 /ffmpeg.c
parent83db71977700d3337c84d5945ac8b7e7ee881ac2 (diff)
downloadffmpeg-5ecdfd008bce961c3241eaa1f8dc06e82a6b12db.tar.gz
lavf: deprecate avformat_alloc_output_context() in favor of avformat_alloc_output_context2()
The new function accepts a slightly more intuitive order of paramters, and returns an error code, thus allowing applications to report a meaningful error message.
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index b9d182cdf8..af57fc9456 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3881,10 +3881,10 @@ static void opt_output_file(const char *filename)
if (!strcmp(filename, "-"))
filename = "pipe:";
- oc = avformat_alloc_output_context(last_asked_format, NULL, filename);
+ err = avformat_alloc_output_context2(&oc, NULL, last_asked_format, filename);
last_asked_format = NULL;
if (!oc) {
- print_error(filename, AVERROR(ENOMEM));
+ print_error(filename, err);
ffmpeg_exit(1);
}
file_oformat= oc->oformat;