aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/spdif.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-13 14:38:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-13 14:39:21 +0200
commite9f2e9715b2bf7e379174b4ca3d23b11526561c0 (patch)
treeb99406b7ef06619780077a91fda649e3006df52a /libavformat/spdif.c
parent27e8298c037587d88a3bda1c97caf2351e2e3243 (diff)
parentfbd0dacc8d61ab418b3fa8e7be22017558323e56 (diff)
downloadffmpeg-e9f2e9715b2bf7e379174b4ca3d23b11526561c0.tar.gz
Merge commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56'
* commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56': 4xm: refactor decode_p_block Conflicts: libavcodec/4xm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/spdif.c')
0 files changed, 0 insertions, 0 deletions