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

Unified Diff: trunk/src/media/base/media_file_checker.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
Index: trunk/src/media/base/media_file_checker.cc
===================================================================
--- trunk/src/media/base/media_file_checker.cc (revision 271953)
+++ trunk/src/media/base/media_file_checker.cc (working copy)
@@ -84,20 +84,18 @@
// decoded; otherwise av_free_packet() will corrupt memory.
AVPacket temp_packet = packet;
do {
+ avcodec_get_frame_defaults(frame.get());
result = avcodec_decode_audio4(av_context, frame.get(), &frame_decoded,
&temp_packet);
if (result < 0)
break;
- av_frame_unref(frame.get());
temp_packet.size -= result;
temp_packet.data += result;
- frame_decoded = 0;
} while (temp_packet.size > 0);
} else if (av_context->codec_type == AVMEDIA_TYPE_VIDEO) {
+ avcodec_get_frame_defaults(frame.get());
result = avcodec_decode_video2(av_context, frame.get(), &frame_decoded,
&packet);
- if (result >= 0 && frame_decoded)
- av_frame_unref(frame.get());
}
av_free_packet(&packet);
} while (base::TimeTicks::Now() < deadline && read_ok && result >= 0);
« no previous file with comments | « trunk/src/media/base/audio_video_metadata_extractor_unittest.cc ('k') | trunk/src/media/cast/test/sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698