lavf: cosmetics, reformat av_read_frame().

libavformat/utils.c

@@ -1261,9 +1261,8 @@ static int read_from_packet_buffer(AVFormatContext *s, AVPacket *pkt)
 
 int av_read_frame(AVFormatContext *s, AVPacket *pkt)
 {
-    AVPacketList *pktl;
-    int eof=0;
     const int genpts = s->flags & AVFMT_FLAG_GENPTS;
+    int          eof = 0;
 
     if (!genpts)
         return s->packet_buffer ? read_from_packet_buffer(s, pkt) :
@@ -1271,7 +1270,7 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt)
 
     for (;;) {
         int ret;
-        pktl = s->packet_buffer;
+        AVPacketList *pktl = s->packet_buffer;
 
         if (pktl) {
             AVPacket *next_pkt = &pktl->pkt;
@@ -1279,9 +1278,9 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt)
             if (next_pkt->dts != AV_NOPTS_VALUE) {
                 int wrap_bits = s->streams[next_pkt->stream_index]->pts_wrap_bits;
                 while (pktl && next_pkt->pts == AV_NOPTS_VALUE) {
-                    if(   pktl->pkt.stream_index == next_pkt->stream_index
-                       && (0 > av_compare_mod(next_pkt->dts, pktl->pkt.dts, 2LL << (wrap_bits - 1)))
-                       && av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) { //not b frame
+                    if (pktl->pkt.stream_index == next_pkt->stream_index &&
+                        (av_compare_mod(next_pkt->dts, pktl->pkt.dts, 2LL << (wrap_bits - 1)) < 0) &&
+                         av_compare_mod(pktl->pkt.pts, pktl->pkt.dts, 2LL << (wrap_bits - 1))) { //not b frame
                         next_pkt->pts = pktl->pkt.dts;
                     }
                     pktl = pktl->next;