aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacps.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-11 14:28:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-11 14:28:18 +0200
commitb6c3487e7f2f8f0d8fae9df023c46ed3112c7443 (patch)
tree414b4d0e04e8e7763a36600f9763a8ef8a279510 /libavcodec/aacps.c
parentde31814ab07fd971d24c66a5e1ecf464b7ebe033 (diff)
parent88058d9a994f42e4e9ed4e67baf696bbfe53128c (diff)
downloadffmpeg-b6c3487e7f2f8f0d8fae9df023c46ed3112c7443.tar.gz
Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c'
* commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c': vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures segment: support applehttp style list Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacps.c')
0 files changed, 0 insertions, 0 deletions