diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 13:22:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-26 13:22:48 +0100 |
| commit | 2cdedcbceab952297d5ee0f433b5a5c7482e48d6 (patch) | |
| tree | d4e6a15939fa7655758c99ca15e369cd9d9c666a /libavformat/aqtitledec.c | |
| parent | 795b911bd8acaec4b6f7dc1590f63a529c028ac8 (diff) | |
| parent | 75644335b907919057960716508477239c26fed4 (diff) | |
| download | ffmpeg-2cdedcbceab952297d5ee0f433b5a5c7482e48d6.tar.gz | |
Merge commit '75644335b907919057960716508477239c26fed4'
* commit '75644335b907919057960716508477239c26fed4':
lavc: Move start code finding to utils.c
Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aqtitledec.c')
0 files changed, 0 insertions, 0 deletions