eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-04 21:25:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5a4e9fe855282a99586050a507d0a486ad39df5b'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-03-06 23:56:07 +01:00
parent 90f8b2ce48 5a4e9fe855
commit ff9b607489
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/internal.h
View File

@@ -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().