diff options
| author | Michael Niedermayer <[email protected]> | 2011-04-08 02:50:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2011-04-08 02:50:13 +0200 |
| commit | c88caa522c41cd4108d39d8dd98805e867606ae3 (patch) | |
| tree | 90eacfa0065bb907cd6543f5b2865d31d3d0a677 /libavformat/output-example.c | |
| parent | db95e559f2b1c392295b09e8457d6f161eb5acdb (diff) | |
| parent | a2031251c7eedd0d82cb9e08717990fa2ae6299f (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
proto: include os_support.h in network.h
matroskaenc: don't write an empty Cues element.
lavc: add a FF_API_REQUEST_CHANNELS deprecation macro
avio: move extern url_interrupt_cb declaration from avio.h to url.h
avio: make av_register_protocol2 internal.
avio: avio_ prefix for url_set_interrupt_cb.
avio: AVIO_ prefixes for URL_ open flags.
proto: introduce listen option in tcp
doc: clarify configure features
proto: factor ff_network_wait_fd and use it on udp
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/output-example.c')
| -rw-r--r-- | libavformat/output-example.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/output-example.c b/libavformat/output-example.c index b6be2b97db..27db78c658 100644 --- a/libavformat/output-example.c +++ b/libavformat/output-example.c @@ -492,7 +492,7 @@ int main(int argc, char **argv) /* open the output file, if needed */ if (!(fmt->flags & AVFMT_NOFILE)) { - if (avio_open(&oc->pb, filename, URL_WRONLY) < 0) { + if (avio_open(&oc->pb, filename, AVIO_WRONLY) < 0) { fprintf(stderr, "Could not open '%s'\n", filename); exit(1); } |