virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'

Browse Source 
* commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d':
  avconv: rename output_packet() to process_input_packet()

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-14 00:23:30 +02:00
commit 097bf149c9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg.c
View File

@ -2057,7 +2057,7 @@ out:
} }
/* pkt = NULL means EOF (needed to flush decoder buffers) */ /* pkt = NULL means EOF (needed to flush decoder buffers) */
static int output_packet(InputStream *ist, const AVPacket *pkt) static int process_input_packet(InputStream *ist, const AVPacket *pkt)
{ {
int ret = 0, i; int ret = 0, i;
int got_output = 0; int got_output = 0;
@ -3340,7 +3340,7 @@ static int process_input(int file_index)
for (i = 0; i < ifile->nb_streams; i++) { for (i = 0; i < ifile->nb_streams; i++) {
ist = input_streams[ifile->ist_index + i]; ist = input_streams[ifile->ist_index + i];
if (ist->decoding_needed) { if (ist->decoding_needed) {
ret = output_packet(ist, NULL); ret = process_input_packet(ist, NULL);
if (ret>0) if (ret>0)
return 0; return 0;
} }
@ -3521,7 +3521,7 @@ static int process_input(int file_index)
sub2video_heartbeat(ist, pkt.pts); sub2video_heartbeat(ist, pkt.pts);
ret = output_packet(ist, &pkt); ret = process_input_packet(ist, &pkt);
if (ret < 0) { if (ret < 0) {
av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n", av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n",
ist->file_index, ist->st->index, av_err2str(ret)); ist->file_index, ist->st->index, av_err2str(ret));
@ -3687,7 +3687,7 @@ static int transcode(void)
for (i = 0; i < nb_input_streams; i++) { for (i = 0; i < nb_input_streams; i++) {
ist = input_streams[i]; ist = input_streams[i];
if (!input_files[ist->file_index]->eof_reached && ist->decoding_needed) { if (!input_files[ist->file_index]->eof_reached && ist->decoding_needed) {
output_packet(ist, NULL); process_input_packet(ist, NULL);
} }
} }
flush_encoders(); flush_encoders();