diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 20:48:00 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-21 19:49:30 +0200 |
commit | fa3f7391be8536ecdf5d8547c0162c68b206043f (patch) | |
tree | ad6fefad32b832af5a505651155b939d8d89232e | |
parent | b7000d05175ee87774decb4b236f773c2059707b (diff) | |
download | ffmpeg-fa3f7391be8536ecdf5d8547c0162c68b206043f.tar.gz |
h264: allow disabling bitstream overread protection by using the fast flag.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 205c13685f36a17f406b7cd07e14b6d2a61f396a)
-rw-r--r-- | libavcodec/h264.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 12bed3a919..5841b1f399 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -197,8 +197,12 @@ const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, int *dst_l if(i>=length-1){ //no escaped 0 *dst_length= length; *consumed= length+1; //+1 for the header - memcpy(dst, src, length); - return dst; + if(h->s.avctx->flags2 & CODEC_FLAG2_FAST){ + return src; + }else{ + memcpy(dst, src, length); + return dst; + } } //printf("decoding esc\n"); |