Revert 271945 "Roll FFmpeg for M37."

trunk/src/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc

Index: trunk/src/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc
===================================================================
--- trunk/src/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc	(revision 271953)
+++ trunk/src/media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc	(working copy)
@@ -54,7 +54,13 @@
   // This is a bit tricky: since the interface does not allow us to replace
   // the pointer of the old packet with a new one, we will initially copy the
   // metadata from old packet to new bigger packet.
-  av_packet_copy_props(&dest_packet, packet);
+  dest_packet.pts = packet->pts;
+  dest_packet.dts = packet->dts;
+  dest_packet.pos = packet->pos;
+  dest_packet.duration = packet->duration;
+  dest_packet.convergence_duration = packet->convergence_duration;
+  dest_packet.flags = packet->flags;
+  dest_packet.stream_index = packet->stream_index;
 
   // Proceed with the conversion of the actual in-band NAL units, leave room
   // for configuration in the beginning.