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

Unified Diff: trunk/src/media/filters/ffmpeg_demuxer.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/filters/ffmpeg_demuxer.cc
===================================================================
--- trunk/src/media/filters/ffmpeg_demuxer.cc (revision 271953)
+++ trunk/src/media/filters/ffmpeg_demuxer.cc (working copy)
@@ -902,7 +902,15 @@
if (!packet->data) {
ScopedAVPacket new_packet(new AVPacket());
av_new_packet(new_packet.get(), 0);
- av_packet_copy_props(new_packet.get(), packet.get());
+
+ new_packet->pts = packet->pts;
+ new_packet->dts = packet->dts;
+ new_packet->pos = packet->pos;
+ new_packet->duration = packet->duration;
+ new_packet->convergence_duration = packet->convergence_duration;
+ new_packet->flags = packet->flags;
+ new_packet->stream_index = packet->stream_index;
+
packet.swap(new_packet);
}
« no previous file with comments | « trunk/src/media/filters/ffmpeg_audio_decoder.cc ('k') | trunk/src/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698