On Tue, Feb 02, 2016 at 03:55:11PM +0000, Kieran Kunhya wrote:
> From b919c9fa3d4778872bc9576705b24cd0c8193f4c Mon Sep 17 00:00:00 2001
> From: Kieran Kunhya <kier...@obe.tv>
> Date: Tue, 2 Feb 2016 15:52:54 +0000
> Subject: [PATCH] avcodec/dirac: Add support for decoding interlaced HQ profile
>
> ---
> libavcodec/dirac.c | 15 ++-----
> libavcodec/dirac.h | 1 +
> libavcodec/diracdec.c | 118
> +++++++++++++++++++++++++++++++++++++-------------
> 3 files changed, 93 insertions(+), 41 deletions(-)
>
> diff --git a/libavcodec/dirac.c b/libavcodec/dirac.c
> index 39df2a8..d19adcf 100644
> --- a/libavcodec/dirac.c
> +++ b/libavcodec/dirac.c
> @@ -324,7 +324,7 @@ int av_dirac_parse_sequence_header(AVDiracSeqHeader
> **pdsh,
> {
> AVDiracSeqHeader *dsh;
> GetBitContext gb;
> - unsigned video_format, picture_coding_mode;
> + unsigned video_format;
> int ret;
>
> dsh = av_mallocz(sizeof(*dsh));
> @@ -373,17 +373,8 @@ int av_dirac_parse_sequence_header(AVDiracSeqHeader
> **pdsh,
> if (ret < 0)
> goto fail;
>
> - /* [DIRAC_STD] picture_coding_mode shall be 0 for fields and 1 for frames
> - * currently only used to signal field coding */
> - picture_coding_mode = svq3_get_ue_golomb(&gb);
> - if (picture_coding_mode != 0) {
> - if (log_ctx) {
> - av_log(log_ctx, AV_LOG_ERROR, "Unsupported picture coding mode
> %d",
> - picture_coding_mode);
> - }
> - ret = AVERROR_INVALIDDATA;
> - goto fail;
> - }
> + /* [DIRAC_STD] picture_coding_mode shall be 1 for fields and 0
> for frames */
> + dsh->field_coding = svq3_get_ue_golomb(&gb);this seems not to apply cleanly Applying: avcodec/dirac: Add support for decoding interlaced HQ profile fatal: corrupt patch at line 36 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. also tools/unwrap-diff fails patching file libavcodec/dirac.c Hunk #2 succeeded at 373 with fuzz 1. patching file libavcodec/dirac.h Hunk #1 succeeded at 85 with fuzz 1 (offset 11 lines). patching file libavcodec/diracdec.c Hunk #1 succeeded at 151 (offset -10 lines). Hunk #2 succeeded at 219 (offset -10 lines). Hunk #3 succeeded at 384 (offset -77 lines). Hunk #4 succeeded at 412 (offset -77 lines). Hunk #5 succeeded at 1753 (offset -77 lines). patch: **** malformed patch at line 113: } [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I am the wisest man alive, for I know one thing, and that is that I know nothing. -- Socrates
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
