diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 21:48:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 21:48:32 +0200 |
| commit | d93cf093f840b9a28481c73d7e421f469f2ca4e7 (patch) | |
| tree | 6159a41d2f67277f41953dd72ae349c3e2670155 /libavcodec/mpeg12dec.c | |
| parent | 5e95551199871e5912c7bd498cbcc502d33113aa (diff) | |
| parent | 632ad2248e2e5d8cd4b51e6c87c943a38c3da425 (diff) | |
Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'
* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425':
lavc: Add an internal wrapper around get_format()
Conflicts:
libavcodec/h264_slice.c
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
0 files changed, 0 insertions, 0 deletions