highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'qatar/master'

Browse Source 
* 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 <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-04-08 02:50:13 +02:00
parent db95e559f2 a2031251c7
commit c88caa522c
37 changed files with 222 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg.c
View File

@ -2569,7 +2569,7 @@ static int transcode(AVFormatContext **output_files,
if (!using_stdin) {
if(verbose >= 0)
fprintf(stderr, "Press [q] to stop encoding\n");
url_set_interrupt_cb(decode_interrupt_cb);
avio_set_interrupt_cb(decode_interrupt_cb);
}
term_init();
@ -3887,7 +3887,7 @@ static void opt_output_file(const char *filename)
}
/* open the file */
if ((err = avio_open(&oc->pb, filename, URL_WRONLY)) < 0) {
if ((err = avio_open(&oc->pb, filename, AVIO_WRONLY)) < 0) {
print_error(filename, err);
ffmpeg_exit(1);
}
@ -4426,7 +4426,7 @@ int main(int argc, char **argv)
#if HAVE_ISATTY
if(isatty(STDIN_FILENO))
url_set_interrupt_cb(decode_interrupt_cb);
avio_set_interrupt_cb(decode_interrupt_cb);
#endif
init_opts();