diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-26 13:45:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-26 13:51:39 +0200 |
| commit | ae0449314ca61e84c64568546922e91f5d81d500 (patch) | |
| tree | fed1676cf7c8c756bf396c099eaa28abcb3398d8 /libavcodec/xsubdec.c | |
| parent | 4552e9b56c8e1a90251a34d0e1f916feb508dd28 (diff) | |
| parent | 92d2b909a0de6e2f77a98405280c78052b35b421 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xsub: feed init_get_bits the whole buffer
libfdk-aac: Allow setting VBR modes via a private option
libfdk-aac: Warn the user that the VBR modes are unsupported
Revert "cbrt_tablegen: Include libm.h"
Conflicts:
libavcodec/xsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xsubdec.c')
| -rw-r--r-- | libavcodec/xsubdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 903cf1290b..bef48384bd 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -87,7 +87,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, bytestream_get_le16(&buf); // The following value is supposed to indicate the start offset // (relative to the palette) of the data for the second field, - // however there are files where it has a bogus value and thus + // however there are files in which it has a bogus value and thus // we just ignore it bytestream_get_le16(&buf); |