On Thu, 14 Jul 2011 16:49:21 -0400, Mike Williams <m...@mikebwilliams.com>
wrote:
> mpegts_read_header is used by both mpegts and mpegtsraw, so this
> erro check is no longer valid.
>
> Signed-off-by: Mike Williams <m...@mikebwilliams.com>
> ---
> libavformat/mpegts.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> index 228f48b..4c25efe 100644
> --- a/libavformat/mpegts.c
> +++ b/libavformat/mpegts.c
> @@ -1470,10 +1470,6 @@ static int mpegts_read_header(AVFormatContext *s,
> if (ap) {
> if (ap->mpeg2ts_compute_pcr)
> ts->mpeg2ts_compute_pcr = ap->mpeg2ts_compute_pcr;
> - if(ap->mpeg2ts_raw){
> - av_log(s, AV_LOG_ERROR, "use mpegtsraw_demuxer!\n");
> - return -1;
> - }
> }
> #endif
>
> --
> 1.7.3.4
>
Pushed.
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
