diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 10:46:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 10:46:47 +0100 |
| commit | ed49e91fd70498ef543d837a3ecbd5af376ecffa (patch) | |
| tree | e6990bc5269b11c48ce33df95e18ff70f32353ef /ffmpeg.c | |
| parent | a21839149cddf2fa6d4cfc37d066cdb68a2ac8aa (diff) | |
| parent | ddc589ce98c2bba1e59318b5b0224717325eac46 (diff) | |
| download | ffmpeg-ed49e91fd70498ef543d837a3ecbd5af376ecffa.tar.gz | |
Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'
* commit 'ddc589ce98c2bba1e59318b5b0224717325eac46':
avconv: drop a now useless variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -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) { AVFrame *decoded_frame, *f; - void *buffer_to_free = NULL; int i, ret = 0, err = 0, resample_changed; int64_t best_effort_timestamp; 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(decoded_frame); - av_free(buffer_to_free); return err < 0 ? err : ret; } |