har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'

Browse Source 
* commit 'ddc589ce98c2bba1e59318b5b0224717325eac46':
  avconv: drop a now useless variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-28 10:46:36 +01:00
commit ed49e91fd7
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -1652,7 +1652,6 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
{ {
AVFrame *decoded_frame, *f; AVFrame *decoded_frame, *f;
void *buffer_to_free = NULL;
int i, ret = 0, err = 0, resample_changed; int i, ret = 0, err = 0, resample_changed;
int64_t best_effort_timestamp; int64_t best_effort_timestamp;
AVRational *frame_sample_aspect; AVRational *frame_sample_aspect;
@ -1753,7 +1752,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
av_frame_unref(ist->filter_frame); av_frame_unref(ist->filter_frame);
av_frame_unref(decoded_frame); av_frame_unref(decoded_frame);
av_free(buffer_to_free);
return err < 0 ? err : ret; return err < 0 ? err : ret;
} }