diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:28:29 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:28:29 +0100 |
commit | 87d263a122f6212c236531f8586598605ecab87c (patch) | |
tree | 32b87745ae8461d61561abbcdf6c83c5e27d6c70 /libavcodec/dca.c | |
parent | 6c3e4e391dc881233e0cb96311da5a48a85a0eaf (diff) | |
parent | c2597c5a0a08526493abb9bc9544b61a290fe20f (diff) | |
download | ffmpeg-streaming-87d263a122f6212c236531f8586598605ecab87c.zip ffmpeg-streaming-87d263a122f6212c236531f8586598605ecab87c.tar.gz |
Merge commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f'
* commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f':
h264_refs: cosmetics, reformat
Conflicts:
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dca.c')
0 files changed, 0 insertions, 0 deletions