diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-28 19:34:00 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-06-28 19:34:00 +0400 |
| commit | f3160192cfbb8601a1db0de83b2ffc53478d8183 (patch) | |
| tree | b09de09719f1ea0bae9fdbd42ca2619f9b2fb955 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c | |
| parent | 4526a724d02ca93fa26f5eec7a83e0e2d5a9bfb1 (diff) | |
updated ffmpeg
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2087 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c index 0e2963b12..f2854cf18 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/h264.c @@ -808,7 +808,9 @@ int ff_h264_decode_extradata(H264Context *h) nalsize = AV_RB16(p) + 2;
if(decode_nal_units(h, p, nalsize) != nalsize) {
av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i);
+ /* MPC Custom code begin */
//return -1;
+ /* MPC custom code end */
}
p += nalsize;
}
|