diff options
Diffstat (limited to 'chromium/media/ffmpeg/ffmpeg_unittest.cc')
| -rw-r--r-- | chromium/media/ffmpeg/ffmpeg_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/media/ffmpeg/ffmpeg_unittest.cc b/chromium/media/ffmpeg/ffmpeg_unittest.cc index 9f24845dc98..dbc28c55a93 100644 --- a/chromium/media/ffmpeg/ffmpeg_unittest.cc +++ b/chromium/media/ffmpeg/ffmpeg_unittest.cc @@ -233,7 +233,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> { memcpy(&packet, audio_packets_.peek(), sizeof(packet)); } - avcodec_get_frame_defaults(audio_buffer_.get()); + av_frame_unref(audio_buffer_.get()); result = avcodec_decode_audio4(av_audio_context(), audio_buffer_.get(), &got_audio, &packet); if (!audio_packets_.empty()) { @@ -287,7 +287,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> { memcpy(&packet, video_packets_.peek(), sizeof(packet)); } - avcodec_get_frame_defaults(video_buffer_.get()); + av_frame_unref(video_buffer_.get()); av_video_context()->reordered_opaque = packet.pts; result = avcodec_decode_video2(av_video_context(), video_buffer_.get(), &got_picture, &packet); @@ -382,8 +382,8 @@ class FFmpegTest : public testing::TestWithParam<const char*> { AVPacketQueue audio_packets_; AVPacketQueue video_packets_; - scoped_ptr_malloc<AVFrame, media::ScopedPtrAVFreeFrame> audio_buffer_; - scoped_ptr_malloc<AVFrame, media::ScopedPtrAVFreeFrame> video_buffer_; + scoped_ptr<AVFrame, media::ScopedPtrAVFreeFrame> audio_buffer_; + scoped_ptr<AVFrame, media::ScopedPtrAVFreeFrame> video_buffer_; int64 decoded_audio_time_; int64 decoded_audio_duration_; |