diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:10:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:16:21 +0100 |
| commit | 84ae7294cbaa413b80d632f79d539270dd4bd6b5 (patch) | |
| tree | e44e4c10830565c3072d871405c57a64661eef85 /libavcodec/h264_parser.c | |
| parent | 830e548b9ec32ad7ab02be056db15cbcf3c58346 (diff) | |
| parent | 3178f4d33ff62243f7cdddb081db516ea34396c9 (diff) | |
| download | ffmpeg-84ae7294cbaa413b80d632f79d539270dd4bd6b5.tar.gz | |
Merge commit '3178f4d33ff62243f7cdddb081db516ea34396c9'
* commit '3178f4d33ff62243f7cdddb081db516ea34396c9':
h264: move rbsp_buffer into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 6aec473a9f..f4b97e6761 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -272,7 +272,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, } break; } - ptr = ff_h264_decode_nal(h, buf + buf_index, &dst_length, + ptr = ff_h264_decode_nal(h, sl, buf + buf_index, &dst_length, &consumed, src_length); if (!ptr || dst_length < 0) break; |