diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 22:40:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 22:40:43 +0200 |
| commit | 46a5003a4a69b0e8cd824fd058618011d44bf8ef (patch) | |
| tree | 42e81eacaf93e3db9f3622e0b5abe0ad89701607 /libavutil | |
| parent | e997afdfc61e7c48ae7daea9b45dc6305e85aca0 (diff) | |
| parent | 5d21ca45591bb1c1d2265f8ed972d18c563f145e (diff) | |
| download | ffmpeg-46a5003a4a69b0e8cd824fd058618011d44bf8ef.tar.gz | |
Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'
* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
h264_mp4toannexb_bsf: K&R formatting cosmetics
Conflicts:
libavcodec/h264_mp4toannexb_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions