diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-06 23:56:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 00:01:32 +0100 |
| commit | ff9b607489e6b295d57b9b97f1c23b0a66b273a6 (patch) | |
| tree | 80809ec3d8a177a713f5706fafc4a7985e51cb78 /libavcodec/internal.h | |
| parent | 90f8b2ce48cfbffeb64779a8c2d55a1e078b4657 (diff) | |
| parent | 5a4e9fe855282a99586050a507d0a486ad39df5b (diff) | |
| download | ffmpeg-ff9b607489e6b295d57b9b97f1c23b0a66b273a6.tar.gz | |
Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'
* commit '5a4e9fe855282a99586050a507d0a486ad39df5b':
avcodec/internal: Fix #if DECODE_AUDIO / ENCODE_AUDIO name mismatch
shorten: use the unsigned type where needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 14f7918dbd..af9e58eead 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -62,7 +62,7 @@ typedef struct AVCodecInternal { */ int is_copy; -#if FF_API_OLD_DECODE_AUDIO +#if FF_API_OLD_ENCODE_AUDIO /** * Internal sample count used by avcodec_encode_audio() to fabricate pts. * Can be removed along with avcodec_encode_audio(). |