projects / ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 082d523 30e50c5)
Merge commit '30e50c50274f88f0f5ae829f401cd3c7f5266719'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 23:02:26 +0000 (01:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 23:12:12 +0000 (01:12 +0200)
commit0de0c75ebbecfa86f7c3a12f0cf748e79d221513
treeecda00620aad9c83e3ebd47b218ad0875ffe04c3tree | snapshot
parent082d52354f77a8cc5423a879ce9123dc3d7055cdcommit | diff
parent30e50c50274f88f0f5ae829f401cd3c7f5266719commit | diff
Merge commit '30e50c50274f88f0f5ae829f401cd3c7f5266719'

* commit '30e50c50274f88f0f5ae829f401cd3c7f5266719':
  lavf: eliminate ff_get_audio_frame_size()

Conflicts:
libavformat/utils.c

Not merged as the removed code is needed for some bugfixes and
would break the fate tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg git repo