Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(95)

Unified Diff: trunk/src/media/ffmpeg/ffmpeg_unittest.cc

Issue 296483012: Revert 271945 "Roll FFmpeg for M37." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/media/ffmpeg/ffmpeg_common.h ('k') | trunk/src/media/filters/audio_file_reader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/ffmpeg/ffmpeg_unittest.cc
===================================================================
--- trunk/src/media/ffmpeg/ffmpeg_unittest.cc (revision 271953)
+++ trunk/src/media/ffmpeg/ffmpeg_unittest.cc (working copy)
@@ -233,7 +233,7 @@
memcpy(&packet, audio_packets_.peek(), sizeof(packet));
}
- av_frame_unref(audio_buffer_.get());
+ avcodec_get_frame_defaults(audio_buffer_.get());
result = avcodec_decode_audio4(av_audio_context(), audio_buffer_.get(),
&got_audio, &packet);
if (!audio_packets_.empty()) {
@@ -287,7 +287,7 @@
memcpy(&packet, video_packets_.peek(), sizeof(packet));
}
- av_frame_unref(video_buffer_.get());
+ avcodec_get_frame_defaults(video_buffer_.get());
av_video_context()->reordered_opaque = packet.pts;
result = avcodec_decode_video2(av_video_context(), video_buffer_.get(),
&got_picture, &packet);
« no previous file with comments | « trunk/src/media/ffmpeg/ffmpeg_common.h ('k') | trunk/src/media/filters/audio_file_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698