1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavformat
Michael Niedermayer 571d2ffa47 Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'
* commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
	libavformat/mp3enc.c

See: 40176fc3149bc72c1309f93989a57aec2322e626
See: d62bf5d4e73250295c0a652e151498c5b19cbd63
See: various others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 21:26:20 +02:00
..
2014-04-06 16:41:41 +02:00
2014-04-11 15:37:43 +02:00
2014-04-01 01:13:09 +02:00
2014-04-05 02:18:09 +02:00
2014-03-11 13:22:49 +01:00
2014-03-04 22:54:13 +01:00
2014-03-08 12:36:57 +01:00
2014-04-10 03:24:07 +02:00
2014-04-11 15:37:43 +02:00