diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:05:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 12:05:13 +0100 |
| commit | bbc0f6f9789361f9ddd462bc458410e6f0081d57 (patch) | |
| tree | b26ceba305959785c11ef932c183a9639f31d91d /libswresample | |
| parent | 6c8ac2d78230990f3a01be28d3ef68fb281d6609 (diff) | |
| parent | 25408b2a0660c1e6c8555559c4ed71dff2ede31e (diff) | |
| download | ffmpeg-bbc0f6f9789361f9ddd462bc458410e6f0081d57.tar.gz | |
Merge commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e'
* commit '25408b2a0660c1e6c8555559c4ed71dff2ede31e':
h264: make ff_h264_frame_start static.
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions