aboutsummaryrefslogtreecommitdiffstats
path: root/libpostproc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-04 03:21:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-04 03:24:59 +0200
commit2f9d6ffda78725e11b351a7a5d69414a32010810 (patch)
treeb9bf0e40ad2b85a35af8b5c0b9b6d50c19ad5303 /libpostproc
parent98df93c9fe2dd4698cd7b4d699b248cbfd1427b4 (diff)
parent60df6b004858dcab96fc96c6dd32484780a8d7c3 (diff)
downloadffmpeg-2f9d6ffda78725e11b351a7a5d69414a32010810.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: id3v2: remove pointless casts id3v2: read TXXX frames with two calls to decode_str() instead of one. id3v2: don't discard the whole tag when encountering empty frames. libvpx: fix build with older libvpx versions. ARM: check for inline asm 'y' operand modifier support Conflicts: libavcodec/libvpxenc.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc')
0 files changed, 0 insertions, 0 deletions