diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:39:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:40:54 +0200 |
| commit | b0387edd5e766b1032f946d6cdb35b765bb45435 (patch) | |
| tree | dd3ca8577a8d3b05efee8b1214a80f845ddeb47f /libavcodec/pcm-mpeg.c | |
| parent | 8619362ff1de6605ffe6da8a42bdfe4fb7be75c1 (diff) | |
| parent | f919cc7df6ab844bc12f89fe7bef4fb915a47725 (diff) | |
Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
fate: fix acodec/vsynth tests for make 3.81
pcm_mpeg: fix number of consumed bytes to include the header.
avfilter: include required header file avfilter.h in video.h
x86: Avoid movs on BUTTERFLYPS when in AVX mode
x86: use new schema for ASM macros
fate: convert codec-regression.sh to makefile rules
fate: allow tests to specify unit size for psnr comparison
fate: teach videogen/rotozoom to output a single raw video stream
http: Add support for reusing the http socket for subsequent requests
http: Add support for using persistent connections
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pcm-mpeg.c')
| -rw-r--r-- | libavcodec/pcm-mpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c index 8e1c924021..a268a64c11 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-mpeg.c @@ -312,7 +312,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, if (avctx->debug & FF_DEBUG_BITSTREAM) av_dlog(avctx, "pcm_bluray_decode_frame: decoded %d -> %d bytes\n", retval, buf_size); - return retval; + return retval + 4; } AVCodec ff_pcm_bluray_decoder = { |