diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 14:26:09 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-26 14:26:40 +0200 |
commit | d3ff77023e941e56242297071c1d8074490ed70a (patch) | |
tree | ce5cbb2681fffa9cd6f444208c7c17c3e9020892 /libavdevice/xv.c | |
parent | b32a6da100a55f35b7dcb9577270b48d2fff4ef9 (diff) | |
parent | 5b41eb91e0083755de8c35e8cd005896ec3ab31f (diff) | |
download | ffmpeg-d3ff77023e941e56242297071c1d8074490ed70a.tar.gz |
Merge commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f'
* commit '5b41eb91e0083755de8c35e8cd005896ec3ab31f':
mov: Parse tmcd extradata
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/xv.c')
0 files changed, 0 insertions, 0 deletions