Bump ffmpeg from 22950 to 25082

[handbrake-jp/handbrake-jp-git.git] / libhb / stream.c

diff --git a/libhb/stream.c b/libhb/stream.c
index 733727c..9166ace 100644 (file)
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -58,7 +58,11 @@ static const stream2codec_t st2codec[256] = {
     st(0x0e, N, 0,                 0,              "ISO 13818-1 auxiliary"),
     st(0x0f, A, HB_ACODEC_MPGA,    CODEC_ID_AAC,   "ISO 13818-7 AAC Audio"),
     st(0x10, V, WORK_DECAVCODECV,  CODEC_ID_MPEG4, "MPEG4"),
+#if defined(OLD_LATM_PATCH)
     st(0x11, A, HB_ACODEC_MPGA,    CODEC_ID_AAC_LATM, "MPEG4 LATM AAC"),
+#else
+    st(0x11, N, 0,                 0,              "MPEG4 LATM AAC"),
+#endif
     st(0x12, U, 0,                 0,              "MPEG4 generic"),
 
     st(0x14, N, 0,                 0,              "ISO 13818-6 DSM-CC download"),
@@ -2543,6 +2547,7 @@ int hb_ts_decode_pkt( hb_stream_t *stream, const uint8_t * pkt, hb_buffer_t *obu
                              ( pkt[10] >> 7 );
             ++stream->ts_pcr_in;
             stream->ts_found_pcr = 1;
+            stream->ts_flags |= TS_HAS_PCR;
         }
     }
 
@@ -2667,7 +2672,7 @@ int hb_ts_decode_pkt( hb_stream_t *stream, const uint8_t * pkt, hb_buffer_t *obu
                     return 0;
                 }
                 // if we have a dts use it otherwise use the pts
-                stream->ts_pcr = pes_timestamp( pes + ( pes[7] & 0x40? 14 : 9 ) );
+                stream->ts_pcr = pes_timestamp( pes + ( pes[7] & 0x40?14:9 ) );
                 ++stream->ts_pcr_in;
             }
         }