diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:00:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:17:51 +0100 |
| commit | b9d887c225466576ae80ef7f2b109e866ff137b2 (patch) | |
| tree | 61ffb780b58021fe4186fb2caad3a8fdcb09bc5f /libavcodec/a64multienc.c | |
| parent | b6e7041f90daf89b17a10bcd73cd3b42d4e3540a (diff) | |
| parent | 072be3e8969f24113d599444be4d6a0ed04a6602 (diff) | |
| download | ffmpeg-b9d887c225466576ae80ef7f2b109e866ff137b2.tar.gz | |
Merge commit '072be3e8969f24113d599444be4d6a0ed04a6602'
* commit '072be3e8969f24113d599444be4d6a0ed04a6602':
h264: set parameters from SPS whenever it changes
asyncts: cosmetics: reindent
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/a64multienc.c')
0 files changed, 0 insertions, 0 deletions