diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:26:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:26:13 +0200 |
| commit | d0ab71ed11c54c40b1c975c713dee8d3993ccdc5 (patch) | |
| tree | d0849ac53365bcac864997d67825435cd907740b /ffmpeg.c | |
| parent | 719fde47ca641edd4321f384579438f930bc50eb (diff) | |
| parent | 292a08cbab3392a693b1c3b03a9cac6a1b65d304 (diff) | |
| download | ffmpeg-d0ab71ed11c54c40b1c975c713dee8d3993ccdc5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: cosmetics, reformat ff_asf_parse_packet()
g.723.1: add missing CODEC_CAP_DR1
avconv: remove now unneeded calls to avcodec_get_frame_defaults().
lavc: initialize output AVFrame before decoding.
Conflicts:
libavformat/asfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -1422,8 +1422,6 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame())) return AVERROR(ENOMEM); - else - avcodec_get_frame_defaults(ist->decoded_frame); decoded_frame = ist->decoded_frame; update_benchmark(NULL); @@ -1545,8 +1543,6 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) if (!ist->decoded_frame && !(ist->decoded_frame = avcodec_alloc_frame())) return AVERROR(ENOMEM); - else - avcodec_get_frame_defaults(ist->decoded_frame); decoded_frame = ist->decoded_frame; pkt->dts = av_rescale_q(ist->dts, AV_TIME_BASE_Q, ist->st->time_base); |