aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg4audio.h
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-13 16:17:18 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-13 16:17:23 +0100
commite7ac968f60dddd24c681101d5b9351c53ebc42f6 (patch)
treed934c448fd9eee167378481f464ad207017b324c /libavcodec/mpeg4audio.h
parentf5b93c46e93a98bae9e4b1d3adbeaf7f61420862 (diff)
parent0b6e5d6b32b91c6da79cd919a3c2ede9d682f838 (diff)
downloadffmpeg-e7ac968f60dddd24c681101d5b9351c53ebc42f6.tar.gz
Merge commit '0b6e5d6b32b91c6da79cd919a3c2ede9d682f838'
This commit is a no-op. [16:15] <@Daemon404> wm4, ping [16:15] <@Daemon404> whats up with "avconv: remove sub-frame warning" [16:15] <@Daemon404> it's in libav but not ours? [16:15] <@Daemon404> mailing list bikeshedding? [16:15] <@wm4> it's in ffmpeg.c too [16:16] <@wm4> you can probably skip it for now [16:16] <@wm4> michaelni was against removing it this way [16:17] <@Daemon404> ok * commit '0b6e5d6b32b91c6da79cd919a3c2ede9d682f838': avconv: remove sub-frame warning Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/mpeg4audio.h')
0 files changed, 0 insertions, 0 deletions